projects / openwrt / openwrt.git / blob
? search:


4a6d5121546e56239d8a9584b48991baca3aa19c
[openwrt/openwrt.git] /
1 From ad815f3920035a0c5b6ffe45bddc9fb308194b49 Mon Sep 17 00:00:00 2001
2 From: Bitterblue Smith <rtl8821cerfe2@gmail.com>
3 Date: Tue, 4 Feb 2025 20:40:58 +0200
4 Subject: [PATCH] wifi: rtw88: Rename RTW_RATE_SECTION_MAX to
5 RTW_RATE_SECTION_NUM
6
7 It fits the meaning of the enum better.
8
9 Signed-off-by: Bitterblue Smith <rtl8821cerfe2@gmail.com>
10 Acked-by: Ping-Ke Shih <pkshih@realtek.com>
11 Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
12 Link: https://patch.msgid.link/5a1c5a46-8ebb-43b0-9ab1-b78e2a22b3d2@gmail.com
13 ---
14 drivers/net/wireless/realtek/rtw88/main.h | 12 +++++-----
15 drivers/net/wireless/realtek/rtw88/phy.c | 24 +++++++++----------
16 drivers/net/wireless/realtek/rtw88/rtw8821c.c | 2 +-
17 drivers/net/wireless/realtek/rtw88/rtw8822b.c | 2 +-
18 drivers/net/wireless/realtek/rtw88/rtw8822c.c | 2 +-
19 drivers/net/wireless/realtek/rtw88/rtw88xxa.c | 2 +-
20 drivers/net/wireless/realtek/rtw88/sar.c | 2 +-
21 7 files changed, 23 insertions(+), 23 deletions(-)
22
23 --- a/drivers/net/wireless/realtek/rtw88/main.h
24 +++ b/drivers/net/wireless/realtek/rtw88/main.h
25 @@ -168,7 +168,7 @@ enum rtw_rate_section {
26 RTW_RATE_SECTION_VHT_2S,
27
28 /* keep last */
29 - RTW_RATE_SECTION_MAX,
30 + RTW_RATE_SECTION_NUM,
31 };
32
33 enum rtw_wireless_set {
34 @@ -1937,7 +1937,7 @@ union rtw_sar_cfg {
35
36 struct rtw_sar {
37 enum rtw_sar_sources src;
38 - union rtw_sar_cfg cfg[RTW_RF_PATH_MAX][RTW_RATE_SECTION_MAX];
39 + union rtw_sar_cfg cfg[RTW_RF_PATH_MAX][RTW_RATE_SECTION_NUM];
40 };
41
42 struct rtw_hal {
43 @@ -1981,16 +1981,16 @@ struct rtw_hal {
44 s8 tx_pwr_by_rate_offset_5g[RTW_RF_PATH_MAX]
45 [DESC_RATE_MAX];
46 s8 tx_pwr_by_rate_base_2g[RTW_RF_PATH_MAX]
47 - [RTW_RATE_SECTION_MAX];
48 + [RTW_RATE_SECTION_NUM];
49 s8 tx_pwr_by_rate_base_5g[RTW_RF_PATH_MAX]
50 - [RTW_RATE_SECTION_MAX];
51 + [RTW_RATE_SECTION_NUM];
52 s8 tx_pwr_limit_2g[RTW_REGD_MAX]
53 [RTW_CHANNEL_WIDTH_MAX]
54 - [RTW_RATE_SECTION_MAX]
55 + [RTW_RATE_SECTION_NUM]
56 [RTW_MAX_CHANNEL_NUM_2G];
57 s8 tx_pwr_limit_5g[RTW_REGD_MAX]
58 [RTW_CHANNEL_WIDTH_MAX]
59 - [RTW_RATE_SECTION_MAX]
60 + [RTW_RATE_SECTION_NUM]
61 [RTW_MAX_CHANNEL_NUM_5G];
62 s8 tx_pwr_tbl[RTW_RF_PATH_MAX]
63 [DESC_RATE_MAX];
64 --- a/drivers/net/wireless/realtek/rtw88/phy.c
65 +++ b/drivers/net/wireless/realtek/rtw88/phy.c
66 @@ -88,14 +88,14 @@ const u8 rtw_vht_2s_rates[] = {
67 DESC_RATEVHT2SS_MCS8, DESC_RATEVHT2SS_MCS9
68 };
69
70 -const u8 * const rtw_rate_section[RTW_RATE_SECTION_MAX] = {
71 +const u8 * const rtw_rate_section[RTW_RATE_SECTION_NUM] = {
72 rtw_cck_rates, rtw_ofdm_rates,
73 rtw_ht_1s_rates, rtw_ht_2s_rates,
74 rtw_vht_1s_rates, rtw_vht_2s_rates
75 };
76 EXPORT_SYMBOL(rtw_rate_section);
77
78 -const u8 rtw_rate_size[RTW_RATE_SECTION_MAX] = {
79 +const u8 rtw_rate_size[RTW_RATE_SECTION_NUM] = {
80 ARRAY_SIZE(rtw_cck_rates),
81 ARRAY_SIZE(rtw_ofdm_rates),
82 ARRAY_SIZE(rtw_ht_1s_rates),
83 @@ -1596,7 +1596,7 @@ static void rtw_phy_set_tx_power_limit(s
84 ch_idx = rtw_channel_to_idx(band, ch);
85
86 if (regd >= RTW_REGD_MAX || bw >= RTW_CHANNEL_WIDTH_MAX ||
87 - rs >= RTW_RATE_SECTION_MAX || ch_idx < 0) {
88 + rs >= RTW_RATE_SECTION_NUM || ch_idx < 0) {
89 WARN(1,
90 "wrong txpwr_lmt regd=%u, band=%u bw=%u, rs=%u, ch_idx=%u, pwr_limit=%d\n",
91 regd, band, bw, rs, ch_idx, pwr_limit);
92 @@ -1701,7 +1701,7 @@ rtw_cfg_txpwr_lmt_by_alt(struct rtw_dev
93 u8 bw, rs;
94
95 for (bw = 0; bw < RTW_CHANNEL_WIDTH_MAX; bw++)
96 - for (rs = 0; rs < RTW_RATE_SECTION_MAX; rs++)
97 + for (rs = 0; rs < RTW_RATE_SECTION_NUM; rs++)
98 __cfg_txpwr_lmt_by_alt(&rtwdev->hal, regd, regd_alt,
99 bw, rs);
100 }
101 @@ -2060,7 +2060,7 @@ static u8 rtw_phy_get_5g_tx_power_index(
102 return tx_power;
103 }
104
105 -/* return RTW_RATE_SECTION_MAX to indicate rate is invalid */
106 +/* return RTW_RATE_SECTION_NUM to indicate rate is invalid */
107 static u8 rtw_phy_rate_to_rate_section(u8 rate)
108 {
109 if (rate >= DESC_RATE1M && rate <= DESC_RATE11M)
110 @@ -2076,7 +2076,7 @@ static u8 rtw_phy_rate_to_rate_section(u
111 else if (rate >= DESC_RATEVHT2SS_MCS0 && rate <= DESC_RATEVHT2SS_MCS9)
112 return RTW_RATE_SECTION_VHT_2S;
113 else
114 - return RTW_RATE_SECTION_MAX;
115 + return RTW_RATE_SECTION_NUM;
116 }
117
118 static s8 rtw_phy_get_tx_power_limit(struct rtw_dev *rtwdev, u8 band,
119 @@ -2094,7 +2094,7 @@ static s8 rtw_phy_get_tx_power_limit(str
120 if (regd > RTW_REGD_WW)
121 return power_limit;
122
123 - if (rs == RTW_RATE_SECTION_MAX)
124 + if (rs == RTW_RATE_SECTION_NUM)
125 goto err;
126
127 /* only 20M BW with cck and ofdm */
128 @@ -2138,7 +2138,7 @@ static s8 rtw_phy_get_tx_power_sar(struc
129 .rs = rs,
130 };
131
132 - if (rs == RTW_RATE_SECTION_MAX)
133 + if (rs == RTW_RATE_SECTION_NUM)
134 goto err;
135
136 return rtw_query_sar(rtwdev, &arg);
137 @@ -2227,7 +2227,7 @@ static void rtw_phy_set_tx_power_index_b
138 u8 bw;
139 int i;
140
141 - if (rs >= RTW_RATE_SECTION_MAX)
142 + if (rs >= RTW_RATE_SECTION_NUM)
143 return;
144
145 rates = rtw_rate_section[rs];
146 @@ -2258,7 +2258,7 @@ static void rtw_phy_set_tx_power_level_b
147 else
148 rs = RTW_RATE_SECTION_OFDM;
149
150 - for (; rs < RTW_RATE_SECTION_MAX; rs++)
151 + for (; rs < RTW_RATE_SECTION_NUM; rs++)
152 rtw_phy_set_tx_power_index_by_rs(rtwdev, ch, path, rs);
153 }
154
155 @@ -2353,7 +2353,7 @@ void rtw_phy_tx_power_limit_config(struc
156
157 for (regd = 0; regd < RTW_REGD_MAX; regd++)
158 for (bw = 0; bw < RTW_CHANNEL_WIDTH_MAX; bw++)
159 - for (rs = 0; rs < RTW_RATE_SECTION_MAX; rs++)
160 + for (rs = 0; rs < RTW_RATE_SECTION_NUM; rs++)
161 __rtw_phy_tx_power_limit_config(hal, regd, bw, rs);
162 }
163
164 @@ -2389,7 +2389,7 @@ void rtw_phy_init_tx_power(struct rtw_de
165 /* init tx power limit */
166 for (regd = 0; regd < RTW_REGD_MAX; regd++)
167 for (bw = 0; bw < RTW_CHANNEL_WIDTH_MAX; bw++)
168 - for (rs = 0; rs < RTW_RATE_SECTION_MAX; rs++)
169 + for (rs = 0; rs < RTW_RATE_SECTION_NUM; rs++)
170 rtw_phy_init_tx_power_limit(rtwdev, regd, bw,
171 rs);
172 }
173 --- a/drivers/net/wireless/realtek/rtw88/rtw8821c.c
174 +++ b/drivers/net/wireless/realtek/rtw88/rtw8821c.c
175 @@ -709,7 +709,7 @@ static void rtw8821c_set_tx_power_index(
176 int rs, path;
177
178 for (path = 0; path < hal->rf_path_num; path++) {
179 - for (rs = 0; rs < RTW_RATE_SECTION_MAX; rs++) {
180 + for (rs = 0; rs < RTW_RATE_SECTION_NUM; rs++) {
181 if (rs == RTW_RATE_SECTION_HT_2S ||
182 rs == RTW_RATE_SECTION_VHT_2S)
183 continue;
184 --- a/drivers/net/wireless/realtek/rtw88/rtw8822b.c
185 +++ b/drivers/net/wireless/realtek/rtw88/rtw8822b.c
186 @@ -964,7 +964,7 @@ static void rtw8822b_set_tx_power_index(
187 int rs, path;
188
189 for (path = 0; path < hal->rf_path_num; path++) {
190 - for (rs = 0; rs < RTW_RATE_SECTION_MAX; rs++)
191 + for (rs = 0; rs < RTW_RATE_SECTION_NUM; rs++)
192 rtw8822b_set_tx_power_index_by_rate(rtwdev, path, rs,
193 &phy_pwr_idx);
194 }
195 --- a/drivers/net/wireless/realtek/rtw88/rtw8822c.c
196 +++ b/drivers/net/wireless/realtek/rtw88/rtw8822c.c
197 @@ -2746,7 +2746,7 @@ static void rtw8822c_set_tx_power_index(
198 s8 diff_idx[4];
199
200 rtw8822c_set_write_tx_power_ref(rtwdev, pwr_ref_cck, pwr_ref_ofdm);
201 - for (rs = 0; rs < RTW_RATE_SECTION_MAX; rs++) {
202 + for (rs = 0; rs < RTW_RATE_SECTION_NUM; rs++) {
203 for (j = 0; j < rtw_rate_size[rs]; j++) {
204 rate = rtw_rate_section[rs][j];
205 pwr_a = hal->tx_pwr_tbl[RF_PATH_A][rate];
206 --- a/drivers/net/wireless/realtek/rtw88/rtw88xxa.c
207 +++ b/drivers/net/wireless/realtek/rtw88/rtw88xxa.c
208 @@ -1637,7 +1637,7 @@ void rtw88xxa_set_tx_power_index(struct
209 int rs, path;
210
211 for (path = 0; path < hal->rf_path_num; path++) {
212 - for (rs = 0; rs < RTW_RATE_SECTION_MAX; rs++) {
213 + for (rs = 0; rs < RTW_RATE_SECTION_NUM; rs++) {
214 if (hal->rf_path_num == 1 &&
215 (rs == RTW_RATE_SECTION_HT_2S ||
216 rs == RTW_RATE_SECTION_VHT_2S))
217 --- a/drivers/net/wireless/realtek/rtw88/sar.c
218 +++ b/drivers/net/wireless/realtek/rtw88/sar.c
219 @@ -97,7 +97,7 @@ int rtw_set_sar_specs(struct rtw_dev *rt
220 power, BIT(RTW_COMMON_SAR_FCT));
221
222 for (j = 0; j < RTW_RF_PATH_MAX; j++) {
223 - for (k = 0; k < RTW_RATE_SECTION_MAX; k++) {
224 + for (k = 0; k < RTW_RATE_SECTION_NUM; k++) {
225 arg = (struct rtw_sar_arg){
226 .sar_band = idx,
227 .path = j,
OpenWrt Source Repository